Merge changes from emacs-23
authorChong Yidong <cyd@stupidchicken.com>
Sun, 24 Oct 2010 21:36:09 +0000 (17:36 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 24 Oct 2010 21:36:09 +0000 (17:36 -0400)
commit6e5aa7ecb21b7534175eb2ee59188f7fc337825c
tree8c49a3e041cdfc0465d823df7ffe9ed00ac0f161
parent25b7ee65a42c8e19a66c1d1230ef0b65b5ce84bd
parentc000cab10b175da6ebb56b8225acf51de1c3b6db
Merge changes from emacs-23
21 files changed:
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/misc/ChangeLog
doc/misc/gnus.texi
etc/ChangeLog
lisp/ChangeLog
lisp/ChangeLog.12
lisp/ChangeLog.9
lisp/erc/ChangeLog
lisp/erc/erc-backend.el
lisp/face-remap.el
lisp/gnus/ChangeLog.2
lisp/org/ChangeLog
lisp/progmodes/dcl-mode.el
lisp/progmodes/verilog-mode.el
lisp/woman.el
src/ChangeLog
src/atimer.c
src/dispnew.c
src/frame.c
src/xterm.c